Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Tue, 15 Sep 2015 18:23:36 +0000 (13:23 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Tue, 15 Sep 2015 18:23:36 +0000 (13:23 -0500)

Trivial merge